From f7add802e27eca4d8abbc53525f9654c820134ac Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 13 Jun 2007 02:07:15 +0000 Subject: [PATCH] Remove linux-fb leftovers svn path=/trunk/; revision=18113 --- ChangeLog | 6 ++++ configure.in | 45 ++--------------------------- docs/reference/ChangeLog | 8 +++++ docs/reference/gdk/gdk-sections.txt | 1 - docs/reference/gtk/Makefile.am | 1 - docs/reference/gtk/building.sgml | 16 +--------- docs/reference/gtk/compiling.sgml | 8 ----- docs/reference/gtk/gtk-docs.sgml | 2 -- gdk/Makefile.am | 9 ++---- 9 files changed, 20 insertions(+), 76 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7646d70697..d6290293d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-06-12 Matthias Clasen + + * gdk/Makefile.am: Remove linux-fb from DIST_SUBDIRS + + * configure.in: Remove linux-fb parts. + 2007-06-12 Michael Natterer * gtk/gtkiconview.c (update_text_cell): use PANGO_BREAK_WORD_CHAR diff --git a/configure.in b/configure.in index cd50a090a9..880d01662f 100644 --- a/configure.in +++ b/configure.in @@ -221,13 +221,13 @@ else gdktarget=x11 fi -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32/quartz/directfb]] select non-default GDK target], +AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target], gdktarget=$with_gdktarget) AC_SUBST(gdktarget) case $gdktarget in - x11|linux-fb|win32|quartz|directfb) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz, directfb or win32.]);; + x11|win32|quartz|directfb) ;; + *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);; esac gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la @@ -236,16 +236,6 @@ gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la AC_SUBST(gdktargetlib) AC_SUBST(gtktargetlib) -AC_ARG_ENABLE(shadowfb, - [AC_HELP_STRING([--disable-shadowfb], - [disable shadowfb support for linux-fb])],, - [enable_shadowfb=yes]) - -AC_ARG_ENABLE(fbmanager, - [AC_HELP_STRING([--enable-fbmanager], - [enable framebuffer manager support (GtkFB)])],, - enable_fbmanager=no) - if test "x$enable_debug" = "xyes"; then test "$cflags_set" = set || CFLAGS="$CFLAGS -g" GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" @@ -1395,24 +1385,6 @@ AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS) AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS) AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS) -if test "x$gdktarget" = "xlinux-fb"; then - if test x$enable_shadowfb = xyes ; then - AC_DEFINE(ENABLE_SHADOW_FB) - fi - - if test x$enable_fbmanager = xyes ; then - AC_DEFINE(ENABLE_FB_MANAGER) - AM_CONDITIONAL(ENABLE_FB_MANAGER, true) - else - AM_CONDITIONAL(ENABLE_FB_MANAGER, false) - fi - - AM_CONDITIONAL(USE_LINUX_FB, true) -else - AM_CONDITIONAL(USE_LINUX_FB, false) - AM_CONDITIONAL(ENABLE_FB_MANAGER, false) -fi - if test "x$gdktarget" = "xdirectfb"; then DIRECTFB_REQUIRED_VERSION=0.9.24 AC_MSG_CHECKING(for DirectFB) @@ -1706,10 +1678,6 @@ if test "x$gdktarget" = "xx11" ; then elif test "x$gdktarget" = "xwin32" ; then gdk_windowing=' #define GDK_WINDOWING_WIN32' -elif test "x$gdktarget" = "xlinux-fb" ; then - gdk_windowing=' -#define GDK_WINDOWING_FB -#define GDK_NATIVE_WINDOW_POINTER' elif test "x$gdktarget" = "xquartz" ; then gdk_windowing=' #define GDK_WINDOWING_QUARTZ' @@ -1772,7 +1740,6 @@ gdk/x11/Makefile gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc -gdk/linux-fb/Makefile gdk/quartz/Makefile gdk/directfb/Makefile gtk/Makefile @@ -1803,9 +1770,3 @@ AC_OUTPUT echo "configuration: target: $gdktarget" - -if test "x$gdktarget" = "xlinux-fb"; then - echo "Warning: The linux-fb GDK target is unmaintained" - echo " and may not work or even compile" -fi - diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 50fa1e0235..40278085df 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,11 @@ +2007-06-12 Matthias Clasen + + * gdk/gdk-sections.txt: Remove GDK_WINDOWING_FB + * gtk/Makefile.am: + * gtk/gtk-docs.sgml: + * gtk/compiling.sgml: + * gtk/building.sgml: Remove linux-fb references + 2007-06-09 Matthias Clasen * gtk/gtk-update-icon-cache.xml: Document --validate diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index d0828990f5..0da3b962e4 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -55,7 +55,6 @@ gdk_error_trap_pop GDK_WINDOWING_X11 GDK_WINDOWING_WIN32 -GDK_WINDOWING_FB GDK_TYPE_GRAB_STATUS diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index ecd8b94d41..e01054f5d8 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -122,7 +122,6 @@ content_files = \ changes-2.0.sgml \ compiling.sgml \ directfb.sgml \ - framebuffer.sgml \ glossary.xml \ migrating-checklist.sgml \ migrating-GtkAction.sgml \ diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml index ffbb43c49c..82362fd895 100644 --- a/docs/reference/gtk/building.sgml +++ b/docs/reference/gtk/building.sgml @@ -344,11 +344,7 @@ How to compile GTK+ itself --with-xinput=[no|yes] - --with-gdktarget=[x11|linux-fb|win32|quartz|directfb] - - - --disable-shadowfb - --enable-shadowfb + --with-gdktarget=[x11|win32|quartz|directfb] @@ -542,16 +538,6 @@ How to compile GTK+ itself - - <systemitem>--disable-shadowfb</systemitem> and - <systemitem>--enable-shadowfb</systemitem> - - - Toggles shadow framebuffer support for the linux-fb target, - if selected. - - - diff --git a/docs/reference/gtk/compiling.sgml b/docs/reference/gtk/compiling.sgml index 29aa1463f0..d5b89dea85 100644 --- a/docs/reference/gtk/compiling.sgml +++ b/docs/reference/gtk/compiling.sgml @@ -42,14 +42,6 @@ $ cc `pkg-config --cflags --libs gtk+-2.0` hello.c -o hello - -To compile a GTK+ program for the framebuffer, use the -"gtk+-linux-fb-2.0" package name instead of "gtk+-2.0": - -$ cc `pkg-config --cflags --libs gtk+-linux-fb-2.0` hello.c -o hello - - - If you want to make sure that your program doesn't use any deprecated functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index b8c2e3bea1..dfa7bd4cda 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -205,7 +205,6 @@ - @@ -317,7 +316,6 @@ that is, GUI components such as #GtkButton or #GtkTextView. >k-Windows; >k-OSX; >k-DirectFB; - >k-Framebuffer; >k-Resources; >k-Questions; diff --git a/gdk/Makefile.am b/gdk/Makefile.am index da3e9a9273..e22c318273 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for gtk+/gdk SUBDIRS = $(gdktarget) -DIST_SUBDIRS = linux-fb win32 x11 quartz directfb +DIST_SUBDIRS = win32 x11 quartz directfb EXTRA_DIST = \ keynames.txt \ @@ -152,11 +152,6 @@ libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la libgdk_x11_2_0_la_LDFLAGS = $(LDADD) -libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c -libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -libgdk_linux_fb_2_0_la_LDFLAGS = $(LDADD) - libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la @@ -210,7 +205,7 @@ endif lib_LTLIBRARIES = $(gdktargetlib) -EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la +EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \ gdkmarshalers.h gdkmarshalers.c -- 2.30.2